Skip to content

Upmerge 2021 10 20 #5895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 33 commits into from
Nov 11, 2021
Merged

Upmerge 2021 10 20 #5895

merged 33 commits into from
Nov 11, 2021

Conversation

@rlubos
Copy link
Contributor

@rlubos rlubos commented Oct 21, 2021

No description provided.

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-ble-test doc-required PR must not be merged without tech writer approval. manifest CI-all-test Run All integration tests manifest-trusted-firmware-m manifest-zephyr manifest-memfault-firmware-sdk manifest-mcuboot DNM labels Oct 21, 2021
@github-actions
Copy link

github-actions bot commented Oct 21, 2021 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@7606d9c (for-testing) nrfconnect/sdk-mcuboot@0342165 (main) nrfconnect/[email protected]
memfault-firmware-sdk memfault/[email protected] memfault/[email protected] memfault/[email protected]
nrfxlib nrfconnect/sdk-nrfxlib@4a060cd nrfconnect/sdk-nrfxlib@dbcb163 (main) nrfconnect/[email protected]
openthread nrfconnect/sdk-openthread@de38788 (for-testing,zephyr) N/A N/A
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@d2e9315 nrfconnect/sdk-trusted-firmware-m@f988492 (master) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@15be5e6 nrfconnect/sdk-zephyr@3791175 (main) nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@rlubos rlubos marked this pull request as ready for review October 21, 2021 10:45
rlubos and others added 18 commits November 10, 2021 17:06
@rlubos
samples: openthread: coprocessor: Add chosen zephyr,ot-uart
a697f47 
As per upstream commit f460848, the
OpenThread UART instance is now configured with DT instead of Kconfig.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: zigbee: Align with USB changes
a872739 
Align Zigbee samples with USB changes.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: bluetooth: Align with USB changes
c63a242 
Align Bluetooth samples with USB changes.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
applications: connectivity_bridge: Align with USB changes
3be9488 
Align connectivity bridge app with USB changes.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
applications: Align with USB changes
51e9955 
Align other apps with USB changes.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: nrf9160: modem_shell: Align with upstream console changes
b585224 
Configure console/shell with Device Tree instead of Kconfig. Add extra
step for the CI to build the PPP configuration.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: spm: Remove deleted console configs
8aac945 
Rely on DT instead.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
lib: edge_impulse: Disable FP16 option in samples and apps
9d6fdae 
THe CMSIS DSP provided with edge impulse library does not seem to be
compatible with recently introduced Zephyr CONFIG_FP16 option, it ends
up in a compilation error:

error: conflicting types for 'float_t'

Disable the CONFIG_FP16 option in samples/apps using edge impulse.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
dts: Add vendor-prefixes.txt file
8e357c3 
"pixart" is not defined in the upstream vendor-prefixes.txt, therefore
add it to a local file.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: crypto: rsa: Remove skip from sample.yaml
d9b3fd4 
It's not correct to set `skip: true` together with
`intergration_platform`, therefore remove it.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: keys: random_hw_unique_key: Fix sample.yml
a22c0b0 
`nrf21540dk_nrf52840` was present in integration platforms but not in
the platform allowlist, causing CI failue.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
modules: mcuboot: Enable usb.overlay for mcuboot if USB is present
2fd0fc7 
We need to add USB CDC node for mcuboot for devices that have USB.

Signed-off-by: Robert Lubos <[email protected]>
@SebastianBoe @rlubos
tfm: Use CTR instead of HMAC for RNG
24db13a 
We disable MBEDTLS_CTR_DRBG_C instead of MBEDTLS_HMAC_DRBG_C when
building for TF-M.

We have flash usage issues and HMAC uses much less flash.

It is not clear if there are any users that require CTR and will be
adversely affected by this.

Signed-off-by: Sebastian Bøe <[email protected]>
@rlubos
tests: asset_tracker_v2: Add native_posix conf where needed
b09fd36 
CONFIG_LINKER_ORPHAN_SECTION_PLACE=y needs to be enabled in order to
build event manager successfully.

Signed-off-by: Robert Lubos <[email protected]>
@MarekPieta @rlubos
applications: nrf_desktop: Fix setting initial state of QDEC driver
14985f4 
The QDEC driver starts in active state, setting its state to
active during module initialization returns -EALREADY.

Jira: NCSDK-12129

Signed-off-by: Marek Pieta <[email protected]>
@rakons @rlubos
drivers: sensor: Align used trigger handlers to API changes
851feec 
This commit aligns our usage of the sensor API
to match changes i Zephyr.

Jira: NCSDK-11602

Signed-off-by: Radoslaw Koppel <[email protected]>
@rlubos
doc: samples: Clarify on how to enable USB support in certain samples
89496ae 
It's now also needed to set the DTC_OVERLAY_FILE variable in order to
enable USB support in certain samples.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
doc: Remove "whitelist" references in nRF Desktop and CAF
c857642 
Rephrase the sentences in nRF Desktop and CAF documentation where
"whiltelist" term was still used.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos rlubos force-pushed the upmerge-2021-10-20 branch from e1822eb to c857642 Compare November 10, 2021 16:06
@github-actions github-actions bot added CI-all-test Run All integration tests and removed CI-all-test Run All integration tests DNM labels Nov 10, 2021
@rlubos
Copy link
Contributor Author

rlubos commented Nov 10, 2021

As for the CI, everything passed except for BLE Mesh. The failure doesn't seem to be related to the upmerge though - I saw similar failures in other PRs as well. @trond-snekvik Is there any known issue with the BLE Mesh CI right now?

mariusz-nordicsemi
mariusz-nordicsemi approved these changes Nov 11, 2021
View reviewed changes
Copy link
Contributor

@mariusz-nordicsemi mariusz-nordicsemi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From HomeKit perspective this upmerge PR looks good.

@trond-snekvik
Copy link
Contributor

As for the CI, everything passed except for BLE Mesh. The failure doesn't seem to be related to the upmerge though - I saw similar failures in other PRs as well. @trond-snekvik Is there any known issue with the BLE Mesh CI right now?

@rlubos Yes, this is a known issue that can be ignored.

@rlubos
Copy link
Contributor Author

rlubos commented Nov 11, 2021

As for the CI, everything passed except for BLE Mesh. The failure doesn't seem to be related to the upmerge though - I saw similar failures in other PRs as well. @trond-snekvik Is there any known issue with the BLE Mesh CI right now?

@rlubos Yes, this is a known issue that can be ignored.

@carlescufi In that case I think we're good to merge.

@carlescufi carlescufi merged commit d2a61ff into nrfconnect:main Nov 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kkasperczyk-no kkasperczyk-no kkasperczyk-no left review comments

@tejlmand tejlmand tejlmand left review comments

@nvlsianpu nvlsianpu nvlsianpu approved these changes

@alwa-nordic alwa-nordic alwa-nordic approved these changes

@frkv frkv frkv approved these changes

@lmaciejonczyk lmaciejonczyk lmaciejonczyk approved these changes

@jfischer-no jfischer-no jfischer-no approved these changes

@simensrostad simensrostad simensrostad approved these changes

@hakonfam hakonfam hakonfam approved these changes

@de-nordic de-nordic de-nordic approved these changes

@mariusz-nordicsemi mariusz-nordicsemi mariusz-nordicsemi approved these changes

@mia-ko mia-ko mia-ko approved these changes

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@anangl anangl Awaiting requested review from anangl

@carlescufi carlescufi Awaiting requested review from carlescufi

@grochu grochu Awaiting requested review from grochu

@ioannisg ioannisg Awaiting requested review from ioannisg

@jtguggedal jtguggedal Awaiting requested review from jtguggedal

@KAGA164 KAGA164 Awaiting requested review from KAGA164

@kapi-no kapi-no Awaiting requested review from kapi-no

@lemrey lemrey Awaiting requested review from lemrey

@MarekPorwisz MarekPorwisz Awaiting requested review from MarekPorwisz

@rakons rakons Awaiting requested review from rakons

+5 more reviewers

@VeijoPesonen VeijoPesonen VeijoPesonen left review comments

@jciupis jciupis jciupis approved these changes

@eobalski eobalski eobalski approved these changes

@kruithofa kruithofa kruithofa approved these changes

@trond-snekvik trond-snekvik trond-snekvik approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-all-test Run All integration tests doc-required PR must not be merged without tech writer approval. manifest manifest-mcuboot manifest-memfault-firmware-sdk manifest-nrfxlib manifest-openthread manifest-trusted-firmware-m manifest-zephyr

Projects

None yet

Milestone

1.8.0

Development

Successfully merging this pull request may close these issues.